Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 28 May 2010 00:48:45 +0000 (00:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 28 May 2010 00:48:45 +0000 (00:48 +0000)

Trivial merge